From: tsteven4 <tsteven4@gmail.com>
Date: Mon, 8 Feb 2016 12:58:53 +0000 (-0700)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: archive/raspbian/1.10.0+ds-2+rpi1~1^2~12^2~9^2~32^2~2^2~1
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=2b2f9190b76de455a31c3e574123e712cd60e2fb;p=gpsbabel.git

Merge remote-tracking branch 'upstream/master'
---

2b2f9190b76de455a31c3e574123e712cd60e2fb